Skip to content

Conversation

@aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/ui-e2e-tests
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/ui-e2e-tests

roger-zhangg and others added 30 commits July 15, 2025 20:55
…7678)

## Problem
* Enhanced Developer Experience - Current Remote Lambda debugging
options are limited, primarily relying on print statements. LDK will
significantly improve the developer experience by allowing real-time
inspection of variables and execution flow.
* Authentic Environment Debugging - Customers are eager to debug in the
actual Lambda environment. However, Lambda doesn't allow direct SSH
connections from external sources, making it challenging to access the
runtime for debugging purposes.
* Advantages over Local Debugging - While local debugging is a common
alternative, Remote debugging offers significant benefits: Access to
resources within VPCs, Ability to follow specific IAM rules and
permissions which are typically not possible in a local debugging
solution.
* Efficient Problem Resolution - Debugging in the real Lambda
environment provides the shortest path to identifying and resolving
issues, as it eliminates

[discrepancies](aws/aws-lambda-base-images#112)
between local and real Lambda environments.

## Solution
Remote debugging (LDK) enable developers to remote debug live Lambda
functions from AWS Toolkit for Visual Studio Code. LDK creates a secure
tunnel between a developer’s local computer and a live Lambda function
running in the cloud. With LDK, developers can use Visual Studio Code
debugger to debug a running Lambda function, set break points, inspect
variables, and step through the code.

### File structure
- ldkClient.ts
  - Implement API calls to IoT & Lambda
- localproxy.ts
- Implement the local proxy to connect to the IoT SecureTunneling(ST)
websocket and create a proxy tcp server
- ldkController.ts
  - Control the debug workflow

###  UI update


![image](https://github.com/user-attachments/assets/e526a46d-952c-45c5-aca6-77353d46ca7a)



### Arch


![image](https://github.com/user-attachments/assets/aaf90b74-3060-44b7-bde6-383e15b04910)
### Sequence Diagram


![image](https://github.com/user-attachments/assets/866b61dc-3872-41b0-a140-7b35d0c2a8be)

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
Duplicate code linter was finding errors in the `utils` tests for Lambda

## Solution
Remove duplicate code (now relying on already existing `mockLambda`)

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Notes
- feat(sagemaker): Merging Feature/sagemaker-connect-phase-2 to master
- Reference PR: #7677
---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: aws-toolkit-automation <[email protected]>
Co-authored-by: Roger Zhang <[email protected]>
Co-authored-by: Reed Hamilton <[email protected]>
Co-authored-by: Jacob Chung <[email protected]>
Co-authored-by: aws-ides-bot <[email protected]>
Co-authored-by: aws-asolidu <[email protected]>
Co-authored-by: Newton Der <[email protected]>
Co-authored-by: Newton Der <[email protected]>
… to reconnect (#7684)

## Problem
- When reconnecting to multiple SageMaker Spaces (either via deeplink or
from within the VS Code extension), a **race condition** occurs when
writing to shared temporary files. This can cause the local SageMaker
server to crash due to concurrent access.
- Need clearer error messaging when reconnection to a deeplinked space
is attempted without an active Studio login.

## Solution
- For connections initiated from the VS Code extension, we generate
**unique temporary files** to read the response json.
- For deeplink-based reconnections, we introduce a **queue** to process
session requests sequentially.
- Add `remote_access_token_refresh` flag to the refresh URL to enable
the Studio server to return more specific error messages.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
…logs (#7689)

## Problem

- Removing feature flag for Code Review tool
- Removed change logs for the above too

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
feat(amazonq): write logs to disk with  rotation & cleanup
fix(amazonq): handle suppress single finding, change icon
## Problem

applyDiff may fail and the consequence is the `newCode` to update become
empty string, thus deleting all users' code.


## Before


https://github.com/user-attachments/assets/6524bae2-1374-452d-bb4e-3ec6f865c258






## After




https://github.com/user-attachments/assets/75d5ed7a-6940-4432-a8d9-73c485afb2c3



## Solution


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
This pr: #7670 didn't been
covered by the unit test

## Solution
Add unit test for the activation initialize method.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
…nput (#7697)

## Problem

The auto trigger classifier needs the entire document change event as
input to correctly predict whether to make auto trigger or not. This
code path was lost when we migrate inline completion to Flare (language
server).

## Solution

Implement the IDE side changes for below PRs:

aws/language-server-runtimes#618

aws/language-servers#1912

https://github.com/aws/language-servers/pull/1914/files


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem

The VS Code provideInlineCompletionCallback may not trigger when Enter
is pressed, especially in Python files


## Solution
manually make this trigger. In case of duplicate, the
provideInlineCompletionCallback is already debounced

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
dungdong-aws and others added 15 commits July 23, 2025 13:26
## Problem
Log folder was getting highlighted instead of the file. 

## Solution
Pointed to the file itself instead of the folder.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
fix(amazonq): re-name shortcut to re-use for MCP tools
## Problem
Needed to add a new drop down show logs button at the top. Having just a
web view button would lead to this functionality not work incase the LS
doesnt work.

## Solution
Added the same show logs functionality in the top drop down.
<img width="933" height="448" alt="image"
src="https://github.com/user-attachments/assets/00121f11-52b6-4aba-a183-4b2fd10c5c38"
/>


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
- There is lot of duplicate and unwanted redundant code in
[aws-toolkit-vscode](https://github.com/aws/aws-toolkit-vscode)
repository.

## Solution

- This is the first PR to remove unwanted code.
---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
Added another code setting for show logs.

## Solution
Added another code setting for show logs.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
… all users no matter it's shown or not (#7722)

…

## Problem

by design, the code path should only be applied to "new" users, however
currently it's taking 250ms for all users no matter the UI is displayed
or not.


<img width="843" height="264" alt="image"
src="https://github.com/user-attachments/assets/1d70bb30-a7c6-4f71-b65b-e1d171c85b9d"
/>


## Solution


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
…de (#7759)

## Problem

When a paginated response is in flight, but the user already accepted or
rejected a completion, the subsequent paginated requests should be
cancelled.

This PR also fixes the `codewhispererTotalShownTime` being negative
issue by using performance.now() across all timestamp computation.


## Solution

This is not a user facing change.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
1. when intelliSense suggestion is surfaced, inline completion are not
shown even if provideInlineCompletionItems have returned valid items.
2. provideInlineCompletionItems is unnecessarily debounced at 200ms
which creates a user perceivable delay for inline completion UX. We
already blocked concurrent API call.
3. The items returned by provideInlineCompletionItems, even though they
match the typeahead of the user's current editor (they can be
presented), sometimes VS Code decides to not show them to avoid
interrupting user's typing flow. This not show suggestion decision is
not emitted as API callback or events, causing us to report the
suggestion as Rejected but it should be Discard.

## Solution

1. Force the item to render by calling
`editor.action.inlineSuggest.trigger` command.
<img width="589" height="374" alt="Screenshot 2025-07-24 at 7 45 12 PM"
src="https://github.com/user-attachments/assets/f2723ab4-1d94-49e6-bae1-493c2af16bed"
/>

3. Remove the debounce

5. Use a specific command with when clause context to detect if a
suggestion is shown or not.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
- There is lot of duplicate and unwanted redundant code in
[aws-toolkit-vscode](https://github.com/aws/aws-toolkit-vscode)
repository.

## Solution

- This is the 2nd PR to remove unwanted code.
- Here is the 1st PR:
#7735
---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Github Issue #6902

## Problem

AWS Toolkit version 3.47.0 introduced a regression where profiles using
`source_profile` for role chaining fail to authenticate when the source
profile uses SSO credentials. Users get an "InvalidClientTokenId: The
security token included in the request is invalid" error.

## Root Cause

The issue was introduced in commit 6f6a8c2 (Feb 13, 2025) which
refactored the authentication code to remove deprecated AWS SDK
dependencies. The new implementation in
`makeSharedIniFileCredentialsProvider` method incorrectly assumed that
the source profile would have static credentials (aws_access_key_id and
aws_secret_access_key) directly in the profile data.

When the source profile uses SSO, these static credentials don't exist
in the profile data - they need to be obtained by calling the SSO
service first.

## Solution

The fix modifies the `makeSharedIniFileCredentialsProvider` method in
`packages/core/src/auth/providers/sharedCredentialsProvider.ts` to:

1. Check if the source profile already has resolved credentials (from
`patchSourceCredentials`)
2. If not, create a new `SharedCredentialsProvider` instance for the
source profile and resolve its credentials dynamically
3. Use those resolved credentials to assume the role via STS

This ensures that SSO profiles can be used as source profiles for role
assumption.

## Changed Files

- `packages/core/src/auth/providers/sharedCredentialsProvider.ts` -
Fixed the credential resolution logic
-
`packages/core/src/test/auth/providers/sharedCredentialsProvider.roleChaining.test.ts`
- Added tests to verify the fix

## Testing

The fix includes unit tests that verify:

1. Role chaining from SSO profiles works correctly
2. Role chaining from SSO profiles with MFA works correctly

## Configuration Example

This fix enables configurations like:

```ini
[sso-session aws1_session]
sso_start_url = https://example.awsapps.com/start
sso_region = us-east-1
sso_registration_scopes = sso:account:access

[profile Landing]
sso_session = aws1_session
sso_account_id = 111111111111
sso_role_name = Landing
region = us-east-1

[profile dev]
region = us-east-1
role_arn = arn:aws:iam::123456789012:role/dev
source_profile = Landing
```
Where `dev` profile assumes a role using credentials from the SSO-based
`Landing` profile.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners July 25, 2025 19:08
Will-ShaoHua and others added 6 commits July 25, 2025 12:35
## Problem


## Solution
allow devs to configure Q endpoint via vscode settings.json
```
"aws.dev.codewhispererService": {
        "endpoint": "https://codewhisperer/endpoint/",
        "region": "us-east-1"
    }
```


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
Eclipse Che-based workspaces on remote compute will change their
hostname if the backing compute changes, thus requiring a reauth.

## Solution
Swap to keying off the Che workspace ID, which should be static for
specific workspaces

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
In VSC, we check that the metric name must be in
[aws-toolkit-common](https://github.com/aws/aws-toolkit-common) before
emitting the metric.

Therefore when we want to add a new metric, the current process is:
1. Add new metric in aws-toolkit-common
2. Wait for version to increment (~1 hour)
3. Bump up toolkit-common version in VSC repo
4. Wait for next VSC release (up to 1 week)

Only after steps 1-4, will we be actually emitting the new metric.

JB, VS, and Eclipse do not have this dependency, and assume Flare is the
source of truth for metrics

## Solution
In VSC, Flare is now the source of truth for metrics instead of
depending on aws-toolkit-common




---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Notes:
- Removing agentWalkThrough workflow form VSCode.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
#7777)

## Problem
Sagemaker was showing show logs feature when it cant support it.

## Solution
Added the check for sage maker.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
@surajrdy-aws surajrdy-aws force-pushed the autoMerge/feature/ui-e2e-tests branch from 449cbde to 3a2df64 Compare July 29, 2025 19:48
@bywang56 bywang56 merged commit 5d8706e into feature/ui-e2e-tests Jul 31, 2025
53 of 61 checks passed
@bywang56 bywang56 deleted the autoMerge/feature/ui-e2e-tests branch July 31, 2025 01:49
laura-codess pushed a commit to laura-codess/aws-toolkit-vscode that referenced this pull request Aug 10, 2025
- Resolve conflicts and push to this PR branch.
- **Do not squash-merge** this PR. Use the "Create a merge commit"
option to do a regular merge.

To perform the merge from the command line, you could do something like
the following (where "origin" is the name of the remote in your local
git repo):
```
git stash
git fetch --all
git checkout origin/feature/ui-e2e-tests
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/ui-e2e-tests
```

---------

Co-authored-by: Roger Zhang <[email protected]>
Co-authored-by: 🥩 Flora <[email protected]>
Co-authored-by: Reed Hamilton <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
Co-authored-by: Roger Zhang <[email protected]>
Co-authored-by: Jacob Chung <[email protected]>
Co-authored-by: aws-asolidu <[email protected]>
Co-authored-by: Newton Der <[email protected]>
Co-authored-by: Newton Der <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: Tyrone Smith <[email protected]>
Co-authored-by: Aidan Ton <[email protected]>
Co-authored-by: abhraina-aws <[email protected]>
Co-authored-by: atontb <[email protected]>
Co-authored-by: Nitish <[email protected]>
Co-authored-by: Nitish Kumar Singh <[email protected]>
Co-authored-by: Blake Lazarine <[email protected]>
Co-authored-by: mkovelam <[email protected]>
Co-authored-by: BlakeLazarine <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: Na Yue <[email protected]>
Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: tsmithsz <[email protected]>
Co-authored-by: Reed Hamilton <[email protected]>
Co-authored-by: Boyu <[email protected]>
Co-authored-by: Dung Dong <[email protected]>
Co-authored-by: Bryce Ito <[email protected]>
Co-authored-by: Suraj Reddy <[email protected]>
laura-codess pushed a commit to laura-codess/aws-toolkit-vscode that referenced this pull request Aug 11, 2025
- Resolve conflicts and push to this PR branch.
- **Do not squash-merge** this PR. Use the "Create a merge commit"
option to do a regular merge.

To perform the merge from the command line, you could do something like
the following (where "origin" is the name of the remote in your local
git repo):
```
git stash
git fetch --all
git checkout origin/feature/ui-e2e-tests
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/ui-e2e-tests
```

---------

Co-authored-by: Roger Zhang <[email protected]>
Co-authored-by: 🥩 Flora <[email protected]>
Co-authored-by: Reed Hamilton <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
Co-authored-by: Roger Zhang <[email protected]>
Co-authored-by: Jacob Chung <[email protected]>
Co-authored-by: aws-asolidu <[email protected]>
Co-authored-by: Newton Der <[email protected]>
Co-authored-by: Newton Der <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: Tyrone Smith <[email protected]>
Co-authored-by: Aidan Ton <[email protected]>
Co-authored-by: abhraina-aws <[email protected]>
Co-authored-by: atontb <[email protected]>
Co-authored-by: Nitish <[email protected]>
Co-authored-by: Nitish Kumar Singh <[email protected]>
Co-authored-by: Blake Lazarine <[email protected]>
Co-authored-by: mkovelam <[email protected]>
Co-authored-by: BlakeLazarine <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: Na Yue <[email protected]>
Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: tsmithsz <[email protected]>
Co-authored-by: Reed Hamilton <[email protected]>
Co-authored-by: Boyu <[email protected]>
Co-authored-by: Dung Dong <[email protected]>
Co-authored-by: Bryce Ito <[email protected]>
Co-authored-by: Suraj Reddy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.